+Thu Feb 26 23:26:00 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtkstatusbar.c (set_grip_cursor): New function. Use resize
+ cursors for resize grips. (Bug #129621)
+
+ * gtk/gtktoolbar.c (gtk_toolbar_get_relief_style): Documentation
+ fix - patch by Torsten Schoenfeld.
+
+ * gtk/gtkmenubar.c (gtk_menu_bar_size_request): don't request
+ space between the items. (Bug #110775)
+
+ * gtk/gtkrc.c (_gtk_rc_init): Provide extra horizontal padding
+ inside menu items that are inside a menu bar. (Bug #110775)
+
+ * configure.in (HAVE_XCURSOR): Make XCurosr part of GDK_EXTRA_,
+ not GDK_PACKAGES, to prevent applications from getting linked to
+ it (Bug #119804)
+
+ * gtk/gtkmenubar.c (gtk_menu_bar_size_allocate): Put the vertical
+ ipadding inside the item. (Bug #61843)
+
Thu Feb 26 22:56:40 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwidget.c: Replace gtk_widget_get_mnemonic_widgets()
* gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
+>>>>>>> 1.5032
Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality
+Thu Feb 26 23:26:00 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtkstatusbar.c (set_grip_cursor): New function. Use resize
+ cursors for resize grips. (Bug #129621)
+
+ * gtk/gtktoolbar.c (gtk_toolbar_get_relief_style): Documentation
+ fix - patch by Torsten Schoenfeld.
+
+ * gtk/gtkmenubar.c (gtk_menu_bar_size_request): don't request
+ space between the items. (Bug #110775)
+
+ * gtk/gtkrc.c (_gtk_rc_init): Provide extra horizontal padding
+ inside menu items that are inside a menu bar. (Bug #110775)
+
+ * configure.in (HAVE_XCURSOR): Make XCurosr part of GDK_EXTRA_,
+ not GDK_PACKAGES, to prevent applications from getting linked to
+ it (Bug #119804)
+
+ * gtk/gtkmenubar.c (gtk_menu_bar_size_allocate): Put the vertical
+ ipadding inside the item. (Bug #61843)
+
Thu Feb 26 22:56:40 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwidget.c: Replace gtk_widget_get_mnemonic_widgets()
* gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
+>>>>>>> 1.5032
Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality
+Thu Feb 26 23:26:00 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtkstatusbar.c (set_grip_cursor): New function. Use resize
+ cursors for resize grips. (Bug #129621)
+
+ * gtk/gtktoolbar.c (gtk_toolbar_get_relief_style): Documentation
+ fix - patch by Torsten Schoenfeld.
+
+ * gtk/gtkmenubar.c (gtk_menu_bar_size_request): don't request
+ space between the items. (Bug #110775)
+
+ * gtk/gtkrc.c (_gtk_rc_init): Provide extra horizontal padding
+ inside menu items that are inside a menu bar. (Bug #110775)
+
+ * configure.in (HAVE_XCURSOR): Make XCurosr part of GDK_EXTRA_,
+ not GDK_PACKAGES, to prevent applications from getting linked to
+ it (Bug #119804)
+
+ * gtk/gtkmenubar.c (gtk_menu_bar_size_allocate): Put the vertical
+ ipadding inside the item. (Bug #61843)
+
Thu Feb 26 22:56:40 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwidget.c: Replace gtk_widget_get_mnemonic_widgets()
* gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
+>>>>>>> 1.5032
Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality
+Thu Feb 26 23:26:00 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtkstatusbar.c (set_grip_cursor): New function. Use resize
+ cursors for resize grips. (Bug #129621)
+
+ * gtk/gtktoolbar.c (gtk_toolbar_get_relief_style): Documentation
+ fix - patch by Torsten Schoenfeld.
+
+ * gtk/gtkmenubar.c (gtk_menu_bar_size_request): don't request
+ space between the items. (Bug #110775)
+
+ * gtk/gtkrc.c (_gtk_rc_init): Provide extra horizontal padding
+ inside menu items that are inside a menu bar. (Bug #110775)
+
+ * configure.in (HAVE_XCURSOR): Make XCurosr part of GDK_EXTRA_,
+ not GDK_PACKAGES, to prevent applications from getting linked to
+ it (Bug #119804)
+
+ * gtk/gtkmenubar.c (gtk_menu_bar_size_allocate): Put the vertical
+ ipadding inside the item. (Bug #61843)
+
Thu Feb 26 22:56:40 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwidget.c: Replace gtk_widget_get_mnemonic_widgets()
* gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
+>>>>>>> 1.5032
Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality
+Thu Feb 26 23:26:00 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtkstatusbar.c (set_grip_cursor): New function. Use resize
+ cursors for resize grips. (Bug #129621)
+
+ * gtk/gtktoolbar.c (gtk_toolbar_get_relief_style): Documentation
+ fix - patch by Torsten Schoenfeld.
+
+ * gtk/gtkmenubar.c (gtk_menu_bar_size_request): don't request
+ space between the items. (Bug #110775)
+
+ * gtk/gtkrc.c (_gtk_rc_init): Provide extra horizontal padding
+ inside menu items that are inside a menu bar. (Bug #110775)
+
+ * configure.in (HAVE_XCURSOR): Make XCurosr part of GDK_EXTRA_,
+ not GDK_PACKAGES, to prevent applications from getting linked to
+ it (Bug #119804)
+
+ * gtk/gtkmenubar.c (gtk_menu_bar_size_allocate): Put the vertical
+ ipadding inside the item. (Bug #61843)
+
Thu Feb 26 22:56:40 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkwidget.c: Replace gtk_widget_get_mnemonic_widgets()
* gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
+>>>>>>> 1.5032
Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality
if $have_xcursor ; then
AC_DEFINE(HAVE_XCURSOR, 1, Have the Xcursor library)
- XCURSOR_PACKAGES="xcursor"
- else
- XCURSOR_PACKAGES=
+ GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags xcursor` $GDK_EXTRA_CFLAGS"
+ GDK_EXTRA_LIBS="`$PKG_CONFIG --libs xcursor` $GDK_EXTRA_LIBS"
fi
# Xshm checks
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
-GDK_PACKAGES="$XCURSOR_PACKAGES $PANGO_PACKAGES"
+GDK_PACKAGES="$PANGO_PACKAGES"
GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
</para>
-<!-- ##### SIGNAL GdkPixbufLoader::area-prepared ##### -->
- <para>
- </para>
-
-@gdkpixbufloader:
-
-<!-- ##### SIGNAL GdkPixbufLoader::area-updated ##### -->
- <para>
- </para>
-
-@gdkpixbufloader:
-@arg1:
-@arg2:
-@arg3:
-@arg4:
-
-<!-- ##### SIGNAL GdkPixbufLoader::closed ##### -->
- <para>
- </para>
-
-@gdkpixbufloader:
-
-<!-- ##### SIGNAL GdkPixbufLoader::size-prepared ##### -->
- <para>
- </para>
-
-@gdkpixbufloader:
-@arg1:
-@arg2:
-
<!-- ##### FUNCTION gdk_pixbuf_loader_new ##### -->
<para>
-->
+<!-- ##### SIGNAL GdkPixbufLoader::area-prepared ##### -->
+ <para>
+ </para>
+
+@gdkpixbufloader:
+
+<!-- ##### SIGNAL GdkPixbufLoader::area-updated ##### -->
+ <para>
+ </para>
+
+@gdkpixbufloader:
+@arg1:
+@arg2:
+@arg3:
+@arg4:
+
+<!-- ##### SIGNAL GdkPixbufLoader::closed ##### -->
+ <para>
+ </para>
+
+@gdkpixbufloader:
+
+<!-- ##### SIGNAL GdkPixbufLoader::size-prepared ##### -->
+ <para>
+ </para>
+
+@gdkpixbufloader:
+@arg1:
+@arg2:
+
@obj: A GTK+ object.
+<!-- ##### ARG GdkPixbuf:bits-per-sample ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GdkPixbuf:colorspace ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GdkPixbuf:has-alpha ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GdkPixbuf:height ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GdkPixbuf:n-channels ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GdkPixbuf:pixels ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GdkPixbuf:rowstride ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GdkPixbuf:width ##### -->
+<para>
+
+</para>
+
+
<!-- ##### STRUCT GdkPixbufFrame ##### -->
<para>
This object describes an individual frame of an animation.
</para>
-<!-- ##### ARG GdkPixbuf:bits-per-sample ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:colorspace ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:has-alpha ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:height ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:n-channels ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:pixels ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:rowstride ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GdkPixbuf:width ##### -->
-<para>
-
-</para>
-
<!-- ##### FUNCTION gdk_pixbuf_get_colorspace ##### -->
<para>
#define BORDER_SPACING 0
-#define CHILD_SPACING 3
#define DEFAULT_IPADDING 1
static void gtk_menu_bar_class_init (GtkMenuBarClass *klass);
requisition->width += toggle_size;
requisition->height = MAX (requisition->height, child_requisition.height);
- /* Support for the right justified help menu */
- if ((children == NULL) && GTK_IS_MENU_ITEM(child) &&
- GTK_MENU_ITEM(child)->right_justify)
- {
- requisition->width += CHILD_SPACING;
- }
-
nchildren += 1;
}
}
requisition->width += widget->style->xthickness * 2;
requisition->height += widget->style->ythickness * 2;
}
-
- if (nchildren > 0)
- requisition->width += 2 * CHILD_SPACING * (nchildren - 1);
}
}
GtkAllocation child_allocation;
GtkRequisition child_requisition;
guint offset;
- gint ipadding;
GtkTextDirection direction;
gint ltr_x;
+ gint ipadding;
g_return_if_fail (GTK_IS_MENU_BAR (widget));
g_return_if_fail (allocation != NULL);
if (menu_shell->children)
{
child_allocation.x = (GTK_CONTAINER (menu_bar)->border_width +
- ipadding +
+ ipadding +
BORDER_SPACING);
child_allocation.y = (GTK_CONTAINER (menu_bar)->border_width +
- ipadding +
BORDER_SPACING);
if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
toggle_size);
gtk_widget_size_allocate (child, &child_allocation);
- ltr_x += child_allocation.width + CHILD_SPACING * 2;
+ ltr_x += child_allocation.width;
}
}
}
" bg[NORMAL] = \"#bab5ab\"\n"
"}\n"
"\n"
+ "style \"gtk-default-menu-bar-item-style\" {\n"
+ " GtkMenuItem::horizontal_padding = 5\n"
+ "}\n"
+ "\n"
"style \"gtk-default-menu-item-style\" {\n"
" bg[PRELIGHT] = \"#4b6983\"\n"
" fg[PRELIGHT] = \"#ffffff\"\n"
"widget_class \"*.GtkCheckMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n"
"widget_class \"*.GtkImageMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n"
"widget_class \"*.GtkSeparatorMenuItem.*\" style : gtk \"gtk-default-menu-item-style\"\n"
+ "widget_class \"*GtkMenuBar*GtkMenuItem\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
+ "widget_class \"*GtkMenuBar*GtkAccelMenuItem\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
+ "widget_class \"*GtkMenuBar*GtkRadioMenuItem\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
+ "widget_class \"*GtkMenuBar*GtkCheckMenuItem\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
+ "widget_class \"*GtkMenuBar*GtkImageMenuItem\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
);
}
PROP_HAS_RESIZE_GRIP
};
-static void gtk_statusbar_class_init (GtkStatusbarClass *class);
-static void gtk_statusbar_init (GtkStatusbar *statusbar);
-static void gtk_statusbar_destroy (GtkObject *object);
-static void gtk_statusbar_update (GtkStatusbar *statusbar,
- guint context_id,
- const gchar *text);
-static void gtk_statusbar_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static void gtk_statusbar_realize (GtkWidget *widget);
-static void gtk_statusbar_unrealize (GtkWidget *widget);
-static void gtk_statusbar_map (GtkWidget *widget);
-static void gtk_statusbar_unmap (GtkWidget *widget);
-static gboolean gtk_statusbar_button_press (GtkWidget *widget,
- GdkEventButton *event);
-static gboolean gtk_statusbar_expose_event (GtkWidget *widget,
- GdkEventExpose *event);
-static void gtk_statusbar_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void gtk_statusbar_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static void gtk_statusbar_create_window (GtkStatusbar *statusbar);
-static void gtk_statusbar_destroy_window (GtkStatusbar *statusbar);
-static void gtk_statusbar_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void gtk_statusbar_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
+static void gtk_statusbar_class_init (GtkStatusbarClass *class);
+static void gtk_statusbar_init (GtkStatusbar *statusbar);
+static void gtk_statusbar_destroy (GtkObject *object);
+static void gtk_statusbar_update (GtkStatusbar *statusbar,
+ guint context_id,
+ const gchar *text);
+static void gtk_statusbar_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+static void gtk_statusbar_realize (GtkWidget *widget);
+static void gtk_statusbar_unrealize (GtkWidget *widget);
+static void gtk_statusbar_map (GtkWidget *widget);
+static void gtk_statusbar_unmap (GtkWidget *widget);
+static gboolean gtk_statusbar_button_press (GtkWidget *widget,
+ GdkEventButton *event);
+static gboolean gtk_statusbar_expose_event (GtkWidget *widget,
+ GdkEventExpose *event);
+static void gtk_statusbar_size_request (GtkWidget *widget,
+ GtkRequisition *requisition);
+static void gtk_statusbar_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+static void gtk_statusbar_direction_changed (GtkWidget *widget,
+ GtkTextDirection prev_dir);
+static void gtk_statusbar_create_window (GtkStatusbar *statusbar);
+static void gtk_statusbar_destroy_window (GtkStatusbar *statusbar);
+static void gtk_statusbar_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void gtk_statusbar_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+
static GtkContainerClass *parent_class;
static guint statusbar_signals[SIGNAL_LAST] = { 0 };
widget_class->size_request = gtk_statusbar_size_request;
widget_class->size_allocate = gtk_statusbar_size_allocate;
+
+ widget_class->direction_changed = gtk_statusbar_direction_changed;
class->messages_mem_chunk = g_mem_chunk_new ("GtkStatusbar messages mem chunk",
sizeof (GtkStatusbarMsg),
rect->y = widget->allocation.y + widget->allocation.height - h;
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
- rect->x = widget->allocation.x + widget->allocation.width - w;
+ rect->x = widget->allocation.x + widget->allocation.width - w;
else
- rect->x = widget->allocation.x + widget->style->xthickness;
+ rect->x = widget->allocation.x + widget->style->xthickness;
+}
+
+static void
+set_grip_cursor (GtkStatusbar *statusbar)
+{
+ if (statusbar->has_resize_grip)
+ {
+ GtkWidget *widget = GTK_WIDGET (statusbar);
+ GdkDisplay *display = gtk_widget_get_display (widget);
+ GdkCursorType cursor_type;
+ GdkCursor *cursor;
+
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+ cursor_type = GDK_BOTTOM_RIGHT_CORNER;
+ else
+ cursor_type = GDK_BOTTOM_LEFT_CORNER;
+
+ cursor = gdk_cursor_new_for_display (display, cursor_type);
+ gdk_window_set_cursor (statusbar->grip_window, cursor);
+ gdk_cursor_unref (cursor);
+ }
}
static void
statusbar->grip_window = gdk_window_new (widget->window,
&attributes, attributes_mask);
gdk_window_set_user_data (statusbar->grip_window, widget);
+
+ set_grip_cursor (statusbar);
+}
+
+static void
+gtk_statusbar_direction_changed (GtkWidget *widget,
+ GtkTextDirection prev_dir)
+{
+ GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
+
+ set_grip_cursor (statusbar);
}
static void
* @toolbar: a #GtkToolbar
*
* Returns the relief style of buttons on @toolbar. See
- * gtk_button_set_relief_style().
+ * gtk_button_set_relief().
*
* Return value: The relief style of buttons on @toolbar.
*
projects / gtk4.git / commitdiff